mir: don't always request mir surfaces

Some child window behaviour is faked by painting in the parent, so we
don't bother creating the Mir surface in that case.

diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 5ecec56ba3e932d02713dd1f61ebdb188d93c7e9..80b6e5667e7840cc1fa5029cd8ab3d443549d48d 100644 (file)
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -199,6 +199,15 @@ create_mir_surface (GdkDisplay *display,
   return surface;
 }
 
+/* TODO: Remove once we have proper transient window support. */
+static gboolean
+should_render_in_parent (GdkWindow *window)
+{
+  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+
+  return impl->transient_for && gdk_window_get_window_type (window) != GDK_WINDOW_TOPLEVEL;
+}
+
 static void
 ensure_surface_full (GdkWindow *window,
                      MirBufferUsage buffer_usage)
@@ -207,7 +216,7 @@ ensure_surface_full (GdkWindow *window,
   MirEventDelegate event_delegate = { event_cb, NULL };
   GdkMirWindowReference *window_ref;
 
-  if (impl->surface)
+  if (impl->surface || should_render_in_parent (window))
     return;
 
   /* no destroy notify -- we must leak for now
@@ -289,15 +298,6 @@ redraw_transient (GdkWindow *window)
   gdk_window_invalidate_rect (GDK_MIR_WINDOW_IMPL (window->impl)->transient_for, &r, FALSE);
 }
 
-/* TODO: Remove once we have proper transient window support. */
-static gboolean
-should_render_in_parent (GdkWindow *window)
-{
-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
-  return impl->transient_for && gdk_window_get_window_type (window) != GDK_WINDOW_TOPLEVEL;
-}
-
 static void
 send_buffer (GdkWindow *window)
 {